Add new objects.

2000-11-15  Tor Lillqvist  <tml@iki.fi>

	* gtk/makefile.{mingw,msc}.in (gtk_OBJECTS): Add new objects.

	* gtk/gtk.def: Update.

	* gtk/gtkrc.c: Can't check for G_OS_WIN32 until glib.h has been
	included.
	(gtk_rc_get_im_module_file): Use run-time installation directory
	on Win32.

diff --git a/ChangeLog b/ChangeLog
index 439e4df6cfa4b6c44e5bc19ccc05db7a24a671a5..d8b1b7cb8f382937a02a6ceafe693ea2b5d421cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2000-11-15  Tor Lillqvist  <tml@iki.fi>
 
+       * gtk/makefile.{mingw,msc}.in (gtk_OBJECTS): Add new objects.
+
+       * gtk/gtk.def: Update.
+
+       * gtk/gtkrc.c: Can't check for G_OS_WIN32 until glib.h has been
+       included.
+       (gtk_rc_get_im_module_file): Use run-time installation directory
+       on Win32.
+
        * gdk/win32/rc/gdk.rc: Remove.
        * gdk/win32/rc/gdk.rc.in: New file.
        * gdk/win32/rc/Makefile.am: New file

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 439e4df6cfa4b6c44e5bc19ccc05db7a24a671a5..d8b1b7cb8f382937a02a6ceafe693ea2b5d421cd 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,5 +1,14 @@
 2000-11-15  Tor Lillqvist  <tml@iki.fi>
 
+       * gtk/makefile.{mingw,msc}.in (gtk_OBJECTS): Add new objects.
+
+       * gtk/gtk.def: Update.
+
+       * gtk/gtkrc.c: Can't check for G_OS_WIN32 until glib.h has been
+       included.
+       (gtk_rc_get_im_module_file): Use run-time installation directory
+       on Win32.
+
        * gdk/win32/rc/gdk.rc: Remove.
        * gdk/win32/rc/gdk.rc.in: New file.
        * gdk/win32/rc/Makefile.am: New file

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 439e4df6cfa4b6c44e5bc19ccc05db7a24a671a5..d8b1b7cb8f382937a02a6ceafe693ea2b5d421cd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,14 @@
 2000-11-15  Tor Lillqvist  <tml@iki.fi>
 
+       * gtk/makefile.{mingw,msc}.in (gtk_OBJECTS): Add new objects.
+
+       * gtk/gtk.def: Update.
+
+       * gtk/gtkrc.c: Can't check for G_OS_WIN32 until glib.h has been
+       included.
+       (gtk_rc_get_im_module_file): Use run-time installation directory
+       on Win32.
+
        * gdk/win32/rc/gdk.rc: Remove.
        * gdk/win32/rc/gdk.rc.in: New file.
        * gdk/win32/rc/Makefile.am: New file

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 439e4df6cfa4b6c44e5bc19ccc05db7a24a671a5..d8b1b7cb8f382937a02a6ceafe693ea2b5d421cd 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,5 +1,14 @@
 2000-11-15  Tor Lillqvist  <tml@iki.fi>
 
+       * gtk/makefile.{mingw,msc}.in (gtk_OBJECTS): Add new objects.
+
+       * gtk/gtk.def: Update.
+
+       * gtk/gtkrc.c: Can't check for G_OS_WIN32 until glib.h has been
+       included.
+       (gtk_rc_get_im_module_file): Use run-time installation directory
+       on Win32.
+
        * gdk/win32/rc/gdk.rc: Remove.
        * gdk/win32/rc/gdk.rc.in: New file.
        * gdk/win32/rc/Makefile.am: New file

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 439e4df6cfa4b6c44e5bc19ccc05db7a24a671a5..d8b1b7cb8f382937a02a6ceafe693ea2b5d421cd 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,14 @@
 2000-11-15  Tor Lillqvist  <tml@iki.fi>
 
+       * gtk/makefile.{mingw,msc}.in (gtk_OBJECTS): Add new objects.
+
+       * gtk/gtk.def: Update.
+
+       * gtk/gtkrc.c: Can't check for G_OS_WIN32 until glib.h has been
+       included.
+       (gtk_rc_get_im_module_file): Use run-time installation directory
+       on Win32.
+
        * gdk/win32/rc/gdk.rc: Remove.
        * gdk/win32/rc/gdk.rc.in: New file.
        * gdk/win32/rc/Makefile.am: New file

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 439e4df6cfa4b6c44e5bc19ccc05db7a24a671a5..d8b1b7cb8f382937a02a6ceafe693ea2b5d421cd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,14 @@
 2000-11-15  Tor Lillqvist  <tml@iki.fi>
 
+       * gtk/makefile.{mingw,msc}.in (gtk_OBJECTS): Add new objects.
+
+       * gtk/gtk.def: Update.
+
+       * gtk/gtkrc.c: Can't check for G_OS_WIN32 until glib.h has been
+       included.
+       (gtk_rc_get_im_module_file): Use run-time installation directory
+       on Win32.
+
        * gdk/win32/rc/gdk.rc: Remove.
        * gdk/win32/rc/gdk.rc.in: New file.
        * gdk/win32/rc/Makefile.am: New file

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 439e4df6cfa4b6c44e5bc19ccc05db7a24a671a5..d8b1b7cb8f382937a02a6ceafe693ea2b5d421cd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,14 @@
 2000-11-15  Tor Lillqvist  <tml@iki.fi>
 
+       * gtk/makefile.{mingw,msc}.in (gtk_OBJECTS): Add new objects.
+
+       * gtk/gtk.def: Update.
+
+       * gtk/gtkrc.c: Can't check for G_OS_WIN32 until glib.h has been
+       included.
+       (gtk_rc_get_im_module_file): Use run-time installation directory
+       on Win32.
+
        * gdk/win32/rc/gdk.rc: Remove.
        * gdk/win32/rc/gdk.rc.in: New file.
        * gdk/win32/rc/Makefile.am: New file

diff --git a/gtk/gtk.def b/gtk/gtk.def
index dba8705b5f5ca101809bed96e390255abbd14438..8c99a5060a803c855b0b9fa24952b44c24d9eff2 100755 (executable)
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -474,8 +474,6 @@ EXPORTS
        gtk_drawing_area_get_type
        gtk_drawing_area_new
        gtk_drawing_area_size
-       gtk_editable_changed
-       gtk_editable_claim_selection
        gtk_editable_copy_clipboard
        gtk_editable_cut_clipboard
        gtk_editable_delete_selection
@@ -496,6 +494,7 @@ EXPORTS
        gtk_entry_prepend_text
        gtk_entry_select_region
        gtk_entry_set_editable
+       gtk_entry_set_invisible_char
        gtk_entry_set_max_length
        gtk_entry_set_position
        gtk_entry_set_text
@@ -872,6 +871,9 @@ EXPORTS
        gtk_object_unref
        gtk_object_weakref
        gtk_object_weakunref
+       gtk_old_editable_changed
+       gtk_old_editable_claim_selection
+       gtk_old_editable_get_type
        gtk_option_menu_get_history
        gtk_option_menu_get_menu
        gtk_option_menu_get_type
@@ -1209,15 +1211,32 @@ EXPORTS
        gtk_text_unknown_char_utf8
        gtk_text_view_buffer_to_window_coords
        gtk_text_view_get_buffer
+       gtk_text_view_get_editable
+       gtk_text_view_get_indent
+       gtk_text_view_get_justification
+       gtk_text_view_get_left_margin
        gtk_text_view_get_line_at_y
        gtk_text_view_get_line_yrange
+       gtk_text_view_get_right_margin
        gtk_text_view_get_type
+       gtk_text_view_get_pixels_above_lines
+       gtk_text_view_get_pixels_below_lines
+       gtk_text_view_get_pixels_inside_wrap
+       gtk_text_view_get_tabs
        gtk_text_view_get_window
        gtk_text_view_get_wrap_mode
        gtk_text_view_new_with_buffer
        gtk_text_view_set_border_window_size
        gtk_text_view_set_cursor_visible
        gtk_text_view_set_editable
+       gtk_text_view_set_indent
+       gtk_text_view_set_justification
+       gtk_text_view_set_left_margin
+       gtk_text_view_set_pixels_above_lines
+       gtk_text_view_set_pixels_below_lines
+       gtk_text_view_set_pixels_inside_wrap
+       gtk_text_view_set_right_margin
+       gtk_text_view_set_tabs
        gtk_text_view_set_wrap_mode
        gtk_text_view_window_to_buffer_coords
        gtk_timeout_add

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index b2a528b05366be1df321c2264a207aabd08c7634..a70ac9b991cc2b5c161b6781dac36beb9615dcb7 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -48,11 +48,6 @@
 #define lstat stat
 #endif
 
-#ifdef G_OS_WIN32
-#include <windows.h>           /* For GetWindowsDirectory */
-#include <io.h>
-#endif
-
 #include <glib.h>
 #include "gdkconfig.h"
 
@@ -62,6 +57,11 @@
 #include "gtkintl.h"
 #include "gtkiconfactory.h"
 
+#ifdef G_OS_WIN32
+#include <windows.h>           /* For GetWindowsDirectory */
+#include <io.h>
+#endif
+
 typedef struct _GtkRcSet    GtkRcSet;
 typedef struct _GtkRcNode   GtkRcNode;
 typedef struct _GtkRcFile   GtkRcFile;
@@ -353,12 +353,16 @@ gtk_rc_get_im_module_file (void)
   if (!result)
     {
       if (im_module_file)
-       result = im_module_file;
+       result = g_strdup (im_module_file);
       else
-       result = GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules";
+#ifndef G_OS_WIN32
+       result = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules");
+#else
+       result = g_strdup_printf ("%s\\gtk.immodules", gtk_win32_get_installation_directory ());
+#endif
     }
 
-  return g_strdup (result);
+  return result;
 }
 
 gchar *

diff --git a/gtk/makefile.mingw.in b/gtk/makefile.mingw.in
index 54a5ee687512c1373271ba58a433fd36c53815c3..c02b0455f93f3514ca0fefbe0de4f5cf84c645cf 100644 (file)
--- a/gtk/makefile.mingw.in
+++ b/gtk/makefile.mingw.in
@@ -102,6 +102,7 @@ gtk_OBJECTS =                                       \
        gtkimage.o                              \
        gtkimcontext.o                          \
        gtkimcontextsimple.o                    \
+       gtkimmodule.o                           \
        gtkimmulticontext.o                     \
        gtkinputdialog.o                        \
        gtkinvisible.o                          \
@@ -121,6 +122,7 @@ gtk_OBJECTS =                                       \
        gtkmisc.o                               \
        gtknotebook.o                           \
        gtkobject.o                             \
+       gtkoldeditable.o                        \
        gtkoptionmenu.o                         \
        gtkpacker.o                             \
        gtkpaned.o                              \

diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 3e46a4a1176916e7c130f6840b83a428dda058b2..c51fcb4238bb981e15e3b9437d838dbbc2c032e5 100644 (file)
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -99,6 +99,7 @@ gtk_OBJECTS =                                         \
        gtkimage.obj                            \
        gtkimcontext.obj                        \
        gtkimcontextsimple.obj                  \
+       gtkimmodule.obj                         \
        gtkimmulticontext.obj                   \
        gtkinputdialog.obj                      \
        gtkinvisible.obj                        \
@@ -118,6 +119,7 @@ gtk_OBJECTS =                                       \
        gtkmisc.obj                             \
        gtknotebook.obj                         \
        gtkobject.obj                           \
+       gtkoldeditable.obj                      \
        gtkoptionmenu.obj                       \
        gtkpacker.obj                           \
        gtkpaned.obj                            \